Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

nixVersions.nix_2_25: init at 2.25.2 #355350

Merged
merged 2 commits into from
Nov 18, 2024
Merged

nixVersions.nix_2_25: init at 2.25.2 #355350

merged 2 commits into from
Nov 18, 2024
+20 −23

Conversation

zowoq
Copy link
Contributor

@zowoq zowoq commented Nov 12, 2024

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@Mic92
Copy link
Member

Mic92 commented Nov 12, 2024 •
edited
Loading

Things that need to be tested:

  • nixpkgs-review on x86_64-linux
  • nixpkgs-review on x86_64-darwin
  • nixpkgs-review on aarch64-linux
  • nixpkgs-review on aarch64-darwin
  • passthru.tests
  • Furthermore fallback-paths.nix needs to be updated (check update-all.sh or the README for how to do this.

I can probably run most of the reviews later on.

@Mic92
Copy link
Member

Mic92 commented Nov 12, 2024

I would suggest to split the PR into two. First one just adds 2.25 and the second one does the actual switch. If in the future it turns out that the switch goes smoothly we can upgrade nix right away.

@zowoq
Copy link
Contributor Author

zowoq commented Nov 12, 2024

I would suggest to split the PR into two. First one just adds 2.25 and the second one does the actual switch.

nixVersions.latest: 2.24 -> 2.25

You want the latest bump moved to another PR?

@Mic92
Copy link
Member

Mic92 commented Nov 12, 2024

You want the latest bump moved to another PR?

Yes I think this would speed up the process a bit.

@ofborg ofborg bot added the 8.has: package (new) This PR adds a new package label Nov 12, 2024
@lovesegfault
Copy link
Member

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 355350

x86_64-linux

❌ 5 packages failed to build:
  • nixVersions.nix_2_25
  • nixVersions.nix_2_25.debug
  • nixVersions.nix_2_25.dev
  • nixVersions.nix_2_25.doc
  • nixVersions.nix_2_25.man

@lovesegfault
Copy link
Member

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 355350

aarch64-linux

❌ 5 packages failed to build:
  • nixVersions.nix_2_25
  • nixVersions.nix_2_25.debug
  • nixVersions.nix_2_25.dev
  • nixVersions.nix_2_25.doc
  • nixVersions.nix_2_25.man

@lovesegfault
Copy link
Member

lovesegfault commented Nov 12, 2024 •
edited
Loading

It'd be nice if we started leveraging the new meson build system, I think, but that can happen in another PR as well

@lovesegfault
Copy link
Member

Both failures are due to tests/functional/ca/repl.sh failing, and retrying does not seem to help.

@lovesegfault
Copy link
Member

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 355350

aarch64-darwin

✅ 4 packages built:
  • nixVersions.nix_2_25
  • nixVersions.nix_2_25.dev
  • nixVersions.nix_2_25.doc
  • nixVersions.nix_2_25.man

@Mic92
Copy link
Member

Mic92 commented Nov 13, 2024

It'd be nice if we started leveraging the new meson build system, I think, but that can happen in another PR as well

That's a bit more involved. @roberth has something for it in the works.

@zowoq zowoq changed the title nixVersions.nix_2_25: init at 2.25.0 nixVersions.nix_2_25: init at 2.25.1 Nov 13, 2024
@zowoq zowoq changed the title nixVersions.nix_2_25: init at 2.25.1 nixVersions.nix_2_25: init at 2.25.2 Nov 14, 2024
@Mic92
Copy link
Member

Mic92 commented Nov 18, 2024

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 355350

x86_64-linux

✅ 5 packages built:
  • nixVersions.nix_2_25
  • nixVersions.nix_2_25.debug
  • nixVersions.nix_2_25.dev
  • nixVersions.nix_2_25.doc
  • nixVersions.nix_2_25.man

aarch64-linux

✅ 5 packages built:
  • nixVersions.nix_2_25
  • nixVersions.nix_2_25.debug
  • nixVersions.nix_2_25.dev
  • nixVersions.nix_2_25.doc
  • nixVersions.nix_2_25.man

x86_64-darwin

❌ 4 packages failed to build:
  • nixStatic
  • nixStatic.dev
  • nixStatic.doc
  • nixStatic.man
✅ 4 packages built:
  • nixVersions.nix_2_25
  • nixVersions.nix_2_25.dev
  • nixVersions.nix_2_25.doc
  • nixVersions.nix_2_25.man

@roberth roberth added backport release-24.05 Backport PR automatically backport release-24.11 Backport PR automatically labels Nov 18, 2024
@Mic92 Mic92 mentioned this pull request Nov 18, 2024
Open
13 tasks
@Mic92
Copy link
Member

Mic92 commented Nov 18, 2024

Fixing nixStatic on darwin in the next pr.

@Mic92 Mic92 merged commit 0cb51d5 into NixOS:master Nov 18, 2024
29 of 30 checks passed
@github-actions GitHub Actions
Copy link
Contributor

Backport failed for release-24.05, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-24.05
git worktree add -d .worktree/backport-355350-to-release-24.05 origin/release-24.05
cd .worktree/backport-355350-to-release-24.05
git switch --create backport-355350-to-release-24.05
git cherry-pick -x dd0e17573be7d8da13b168045f3b60fa2b4b580d 10a35620c9a348a87af60316f17ede79fa55a84a

@github-actions GitHub Actions
Copy link
Contributor

Successfully created backport PR for release-24.11:

@github-actions github-actions bot mentioned this pull request Nov 18, 2024
Open
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@edolstra edolstra Awaiting requested review from edolstra

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314

@fricklerhandwerk fricklerhandwerk Awaiting requested review from fricklerhandwerk

@Mic92 Mic92 Awaiting requested review from Mic92

@RaitoBezarius RaitoBezarius Awaiting requested review from RaitoBezarius

@roberth roberth Awaiting requested review from roberth

@tomberek tomberek Awaiting requested review from tomberek

@lovesegfault lovesegfault Awaiting requested review from lovesegfault

@Artturin Artturin Awaiting requested review from Artturin

Assignees
No one assigned
Labels
8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 10.rebuild-linux: 1 backport release-24.05 Backport PR automatically backport release-24.11 Backport PR automatically
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@zowoq @Mic92 @lovesegfault @roberth